merge emacs-24
authorKenichi Handa <handa@gnu.org>
Sat, 15 Dec 2012 11:37:25 +0000 (20:37 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 15 Dec 2012 11:37:25 +0000 (20:37 +0900)
commit42b65c661c7bb70db84eea35b6749b2add165f1a
treedde9ce824086629a3886b197157d685625408c76
parent0742bd2476826e969fefc65c45fdb9eaad7f5d04
parent0cfe7b62e6115ac7292675d71b804539e374c95f
merge emacs-24